--- /dev/null
- From cc10190b64be9b875f102331b720fe192445c270 Mon Sep 17 00:00:00 2001
++From 14846bbc299bdcf3becfc2bdd00a9f062e34bf3f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:24 -0500
+Subject: Remove files that appear to be incompatible with the DFSG
+
+Files that appear to be incompatible with the DFSG have been removed.
+
+A number of files have been removed from this package because their
+licenses are not compatible with the Debian Free Software Guidelines
+(DFSG), or because it wasn't completely clear that their licenses are
+compatible.
+
+In particular, all of the files which are covered under the GFDL and
+have invariant sections have been removed in accordance with this
+General Resolution: http://www.debian.org/vote/2006/vote_001.
+
+The files that have been removed, but still appear to be
+distributable, have been moved to packages in Debian's non-free
+section.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Status: new
+---
+ Makefile.in | 54 ++--
+ admin/update_autogen | 3 +-
+ build-aux/make-info-dir | 3 +-
+ configure.ac | 6 +-
+ doc/misc/Makefile.in | 706 +-----------------------------------------------
+ lisp/help.el | 10 +-
+ 6 files changed, 35 insertions(+), 747 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
- index 103b035..e5d98d2 100644
++index 4987cf6..c8e3b0e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -147,7 +147,9 @@ man1dir=$(mandir)/man1
+ infodir=@infodir@
+ # Info files not in the doc/misc directory (we get those via make echo-info).
+ INFO_EXT=@INFO_EXT@
+-INFO_NONMISC=emacs$(INFO_EXT) eintr$(INFO_EXT) elisp$(INFO_EXT)
++# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg
++# package (see /usr/share/doc/emacs*-common/copyright).
++INFO_NONMISC=
+
+ # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
+ HAVE_MAKEINFO=@HAVE_MAKEINFO@
- @@ -810,10 +812,7 @@ mostlyclean: FRC
++@@ -815,10 +817,7 @@ mostlyclean: FRC
+ cd lib && $(MAKE) $(MFLAGS) mostlyclean
+ cd lib-src && $(MAKE) $(MFLAGS) mostlyclean
+ cd nt && $(MAKE) $(MFLAGS) mostlyclean
+- -cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean
+ -cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean
+- -cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean
+- -cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean
+
+ ### `clean'
+ ### Delete all files from the current directory that are normally
- @@ -831,10 +830,7 @@ clean: FRC
++@@ -836,10 +835,7 @@ clean: FRC
+ cd lib && $(MAKE) $(MFLAGS) clean
+ cd lib-src && $(MAKE) $(MFLAGS) clean
+ cd nt && $(MAKE) $(MFLAGS) clean
+- -cd doc/emacs && $(MAKE) $(MFLAGS) clean
+ -cd doc/misc && $(MAKE) $(MFLAGS) clean
+- -cd doc/lispref && $(MAKE) $(MFLAGS) clean
+- -cd doc/lispintro && $(MAKE) $(MFLAGS) clean
+ cd nextstep && $(MAKE) $(MFLAGS) clean
+
+ ### `bootclean'
- @@ -857,10 +853,7 @@ distclean: FRC
++@@ -862,10 +858,7 @@ distclean: FRC
+ cd lib && $(MAKE) $(MFLAGS) distclean
+ cd lib-src && $(MAKE) $(MFLAGS) distclean
+ cd nt && $(MAKE) $(MFLAGS) distclean
+- cd doc/emacs && $(MAKE) $(MFLAGS) distclean
+ cd doc/misc && $(MAKE) $(MFLAGS) distclean
+- cd doc/lispref && $(MAKE) $(MFLAGS) distclean
+- cd doc/lispintro && $(MAKE) $(MFLAGS) distclean
+ cd leim && $(MAKE) $(MFLAGS) distclean
+ cd lisp && $(MAKE) $(MFLAGS) distclean
+ cd nextstep && $(MAKE) $(MFLAGS) distclean
- @@ -879,10 +872,7 @@ bootstrap-clean: FRC
++@@ -884,10 +877,7 @@ bootstrap-clean: FRC
+ cd lib && $(MAKE) $(MFLAGS) maintainer-clean
+ cd lib-src && $(MAKE) $(MFLAGS) maintainer-clean
+ cd nt && $(MAKE) $(MFLAGS) maintainer-clean
+- -cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean
+ -cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean
+- -cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean
+- -cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean
+ cd leim && $(MAKE) $(MFLAGS) bootstrap-clean
+ cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean
+ cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
- @@ -943,11 +933,11 @@ check: all
++@@ -948,11 +938,11 @@ check: all
+ dist:
+ cd ${srcdir}; ./make-dist
+
+-DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi
+-HTMLS = lispref-html lispintro-html emacs-html misc-html
+-INFOS = lispref-info lispintro-info emacs-info misc-info
+-PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf
+-PSS = lispref-ps lispintro-ps emacs-ps misc-ps
++DVIS = misc-dvi
++HTMLS = misc-html
++INFOS = misc-info
++PDFS = misc-pdf
++PSS = misc-ps
+
+ DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
+ $(DOCS):
- @@ -970,9 +960,7 @@ info-dir: ${srcdir}/info/dir
++@@ -975,9 +965,7 @@ info-dir: ${srcdir}/info/dir
+ ## the info-dir rule from running when not needed.
+ ## Hopefully doc/misc/*.texi is not too long for some systems?
+ info_dir_deps = ${srcdir}/build-aux/dir_top \
+- ${srcdir}/doc/emacs/emacs.texi \
+- ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
+- ${srcdir}/doc/lispref/elisp.texi ${srcdir}/doc/misc/*.texi
++ ${srcdir}/doc/misc/*.texi
+
+ ## It would be much simpler if info/dir was only created in the
+ ## installation location by the install-info rule, but we also
- @@ -987,14 +975,10 @@ ${srcdir}/info/dir: ${info_dir_deps}
++@@ -993,14 +981,10 @@ ${srcdir}/info/dir: ${info_dir_deps}
+ (cd ${srcdir} && ./build-aux/make-info-dir $${thisdir}/$${tempfile}); \
+ ${srcdir}/build-aux/move-if-change $${tempfile} ${srcdir}/info/dir
+
+-INSTALL_DVI = install-emacs-dvi install-lispref-dvi \
+- install-lispintro-dvi install-misc-dvi
+-INSTALL_HTML = install-emacs-html install-lispref-html \
+- install-lispintro-html install-misc-html
+-INSTALL_PDF = install-emacs-pdf install-lispref-pdf \
+- install-lispintro-pdf install-misc-pdf
+-INSTALL_PS = install-emacs-ps install-lispref-ps \
+- install-lispintro-ps install-misc-ps
++INSTALL_DVI = install-misc-dvi
++INSTALL_HTML = install-misc-html
++INSTALL_PDF = install-misc-pdf
++INSTALL_PS = install-misc-ps
+ INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS)
+
+ ## Install non .info forms of the documentation.
- @@ -1012,14 +996,10 @@ install-pdf: $(INSTALL_PDF)
++@@ -1018,14 +1002,10 @@ install-pdf: $(INSTALL_PDF)
+ install-ps: $(INSTALL_PS)
+
+
+-UNINSTALL_DVI = uninstall-emacs-dvi uninstall-lispref-dvi \
+- uninstall-lispintro-dvi uninstall-misc-dvi
+-UNINSTALL_HTML = uninstall-emacs-html uninstall-lispref-html \
+- uninstall-lispintro-html uninstall-misc-html
+-UNINSTALL_PDF = uninstall-emacs-pdf uninstall-lispref-pdf \
+- uninstall-lispintro-pdf uninstall-misc-pdf
+-UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \
+- uninstall-lispintro-ps uninstall-misc-ps
++UNINSTALL_DVI = uninstall-misc-dvi
++UNINSTALL_HTML = uninstall-misc-html
++UNINSTALL_PDF = uninstall-misc-pdf
++UNINSTALL_PS = uninstall-misc-ps
+ UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS)
+
+ $(UNINSTALL_DOC):
+diff --git a/admin/update_autogen b/admin/update_autogen
- index b951196..0a06936 100755
++index 0513d07..5b3709d 100755
+--- a/admin/update_autogen
++++ b/admin/update_autogen
- @@ -249,8 +249,7 @@ info_dir ()
++@@ -263,8 +263,7 @@ info_dir ()
+ $topic
+ EOF
+ ## Bit faster than doc/*/*.texi.
+- for file in doc/emacs/emacs.texi doc/lispintro/*.texi \
+- doc/lispref/elisp.texi doc/misc/*.texi; do
++ for file in doc/misc/*.texi; do
+
+ ## FIXME do not ignore w32 if OS is w32.
+ case $file in
+diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
- index 3f92738..ba74639 100755
++index 5b37cd6..f63c6c67 100755
+--- a/build-aux/make-info-dir
++++ b/build-aux/make-info-dir
+@@ -76,8 +76,7 @@ for topic in "Texinfo documentation system" "Emacs" "Emacs lisp" \
+ $topic
+ EOF
+ ## Bit faster than doc/*/*.texi.
+- for file in doc/emacs/emacs.texi doc/lispintro/emacs-lisp-intro.texi \
+- doc/lispref/elisp.texi doc/misc/*.texi; do
++ for file in doc/misc/*.texi; do
+
+ ## FIXME do not ignore w32 if OS is w32.
+ case $file in
+diff --git a/configure.ac b/configure.ac
- index 458648e..01b110c 100644
++index 4291453..bdc76bc 100644
+--- a/configure.ac
++++ b/configure.ac
- @@ -5110,11 +5110,11 @@ dnl This will work, but you get a config.status that is not quite right
++@@ -5117,11 +5117,11 @@ dnl This will work, but you get a config.status that is not quite right
+ dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html).
+ dnl That doesn't have any obvious consequences for Emacs, but on the whole
+ dnl it seems better to just live with the duplication.
+-SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
++SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
+
+ AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
+- doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
+- doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \
++ doc/misc/Makefile \
++ src/Makefile lwlib/Makefile lisp/Makefile \
+ leim/Makefile nextstep/Makefile nt/Makefile])
+
+ dnl test/ is not present in release tarfiles.
+diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
- index 4254ebe..bf89361 100644
++index 1644833..6918775 100644
+--- a/doc/misc/Makefile.in
++++ b/doc/misc/Makefile.in
- @@ -59,18 +59,14 @@ INSTALL_DATA = @INSTALL_DATA@
++@@ -57,18 +57,14 @@ INSTALL_DATA = @INSTALL_DATA@
+ MAKEINFO = @MAKEINFO@
+ MAKEINFO_OPTS = --force -I$(emacsdir)
+
++# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg
++# package (see /usr/share/doc/emacs*-common/copyright).
++
+ ## On MS Windows, efaq-w32; otherwise blank.
+ DOCMISC_W32 = @DOCMISC_W32@
+
+ ## Info files to build and install on all platforms.
+-INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
+- dbus dired-x ebrowse ede ediff edt eieio \
+- emacs-mime epa erc ert eshell eudc efaq eww \
+- flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
+- mairix-el message mh-e newsticker nxml-mode octave-mode \
+- org pcl-cvs pgg rcirc remember reftex sasl \
+- sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
+- url vip viper widget wisent woman
++INFO_COMMON = efaq
+
+ ## Info files to install on current platform.
+ INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
- @@ -133,162 +129,6 @@ ps: $(PS_TARGETS)
++@@ -131,162 +127,6 @@ ps: $(PS_TARGETS)
+
+ # Note: "<" is not portable in ordinary make rules.
+
+-ada_mode_deps = ${srcdir}/ada-mode.texi ${gfdl}
+-ada-mode : $(buildinfodir)/ada-mode$(INFO_EXT)
+-$(buildinfodir)/ada-mode$(INFO_EXT): $(ada_mode_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ada-mode.texi
+-ada-mode.dvi: $(ada_mode_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
+-ada-mode.pdf: $(ada_mode_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
+-ada-mode.html: $(ada_mode_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ada-mode.texi
+-
+-auth_deps = ${srcdir}/auth.texi ${gfdl}
+-auth : $(buildinfodir)/auth$(INFO_EXT)
+-$(buildinfodir)/auth$(INFO_EXT): $(auth_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/auth.texi
+-auth.dvi: $(auth_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
+-auth.pdf: $(auth_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
+-auth.html: $(auth_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/auth.texi
+-
+-autotype_deps = ${srcdir}/autotype.texi ${gfdl}
+-autotype : $(buildinfodir)/autotype$(INFO_EXT)
+-$(buildinfodir)/autotype$(INFO_EXT): $(autotype_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/autotype.texi
+-autotype.dvi: $(autotype_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
+-autotype.pdf: $(autotype_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
+-autotype.html: $(autotype_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/autotype.texi
+-
+-bovine_deps = ${srcdir}/bovine.texi ${gfdl}
+-bovine : $(buildinfodir)/bovine$(INFO_EXT)
+-$(buildinfodir)/bovine$(INFO_EXT): $(bovine_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/bovine.texi
+-bovine.dvi: $(bovine_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/bovine.texi
+-bovine.pdf: $(bovine_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/bovine.texi
+-bovine.html: $(bovine_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/bovine.texi
+-
+-calc_deps = ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl}
+-calc : $(buildinfodir)/calc$(INFO_EXT)
+-$(buildinfodir)/calc$(INFO_EXT): $(calc_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/calc.texi
+-calc.dvi: $(calc_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
+-calc.pdf: $(calc_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
+-calc.html: $(calc_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/calc.texi
+-
+-cc_mode_deps = ${srcdir}/cc-mode.texi ${gfdl}
+-ccmode : $(buildinfodir)/ccmode$(INFO_EXT)
+-$(buildinfodir)/ccmode$(INFO_EXT): $(cc_mode_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cc-mode.texi
+-cc-mode.dvi: $(cc_mode_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
+-cc-mode.pdf: $(cc_mode_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
+-cc-mode.html: $(cc_mode_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/cc-mode.texi
+-
+-cl_deps = ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl}
+-cl : $(buildinfodir)/cl$(INFO_EXT)
+-$(buildinfodir)/cl$(INFO_EXT): $(cl_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cl.texi
+-cl.dvi: $(cl_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
+-cl.pdf: $(cl_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
+-cl.html: $(cl_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/cl.texi
+-
+-dbus_deps = ${srcdir}/dbus.texi ${gfdl}
+-dbus : $(buildinfodir)/dbus$(INFO_EXT)
+-$(buildinfodir)/dbus$(INFO_EXT): $(dbus_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dbus.texi
+-dbus.dvi: $(dbus_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
+-dbus.pdf: $(dbus_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
+-dbus.html: $(dbus_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/dbus.texi
+-
+-dired_x_deps = ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl}
+-dired-x : $(buildinfodir)/dired-x$(INFO_EXT)
+-$(buildinfodir)/dired-x$(INFO_EXT): $(dired_x_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dired-x.texi
+-dired-x.dvi: $(dired_x_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
+-dired-x.pdf: $(dired_x_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
+-dired-x.html: $(dired_x_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/dired-x.texi
+-
+-ebrowse_deps = ${srcdir}/ebrowse.texi ${gfdl}
+-ebrowse : $(buildinfodir)/ebrowse$(INFO_EXT)
+-$(buildinfodir)/ebrowse$(INFO_EXT): $(ebrowse_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ebrowse.texi
+-ebrowse.dvi: $(ebrowse_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
+-ebrowse.pdf: $(ebrowse_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
+-ebrowse.html: $(ebrowse_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ebrowse.texi
+-
+-ede_deps = ${srcdir}/ede.texi ${gfdl}
+-ede : $(buildinfodir)/ede$(INFO_EXT)
+-$(buildinfodir)/ede$(INFO_EXT): $(ede_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ede.texi
+-ede.dvi: $(ede_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
+-ede.pdf: $(ede_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
+-ede.html: $(ede_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ede.texi
+-
+-ediff_deps = ${srcdir}/ediff.texi ${gfdl}
+-ediff : $(buildinfodir)/ediff$(INFO_EXT)
+-$(buildinfodir)/ediff$(INFO_EXT): $(ediff_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ediff.texi
+-ediff.dvi: $(ediff_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
+-ediff.pdf: $(ediff_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
+-ediff.html: $(ediff_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ediff.texi
+-
+-edt_deps = ${srcdir}/edt.texi ${gfdl}
+-edt : $(buildinfodir)/edt$(INFO_EXT)
+-$(buildinfodir)/edt$(INFO_EXT): $(edt_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/edt.texi
+-edt.dvi: $(edt_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
+-edt.pdf: $(edt_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
+-edt.html: $(edt_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/edt.texi
+-
+ ## No gfdl dependency.
+ efaq_deps = ${srcdir}/efaq.texi $(emacsdir)/emacsver.texi
+ efaq : $(buildinfodir)/efaq$(INFO_EXT)
- @@ -314,544 +154,6 @@ efaq-w32.pdf: $(efaq_w32_deps)
++@@ -312,544 +152,6 @@ efaq-w32.pdf: $(efaq_w32_deps)
+ efaq-w32.html: $(efaq_w32_deps)
+ $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq-w32.texi
+
+-eieio_deps = ${srcdir}/eieio.texi ${gfdl}
+-eieio : $(buildinfodir)/eieio$(INFO_EXT)
+-$(buildinfodir)/eieio$(INFO_EXT): $(eieio_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eieio.texi
+-eieio.dvi: $(eieio_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
+-eieio.pdf: $(eieio_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
+-eieio.html: $(eieio_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eieio.texi
+-
+-emacs_gnutls_deps = ${srcdir}/emacs-gnutls.texi ${gfdl}
+-emacs-gnutls : $(buildinfodir)/emacs-gnutls$(INFO_EXT)
+-$(buildinfodir)/emacs-gnutls$(INFO_EXT): $(emacs_gnutls_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
+-emacs-gnutls.dvi: $(emacs_gnutls_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi
+-emacs-gnutls.pdf: $(emacs_gnutls_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
+-emacs-gnutls.html: $(emacs_gnutls_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
+-
+-emacs_mime_deps = ${srcdir}/emacs-mime.texi ${gfdl}
+-emacs-mime : $(buildinfodir)/emacs-mime$(INFO_EXT)
+-$(buildinfodir)/emacs-mime$(INFO_EXT): $(emacs_mime_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
+-emacs-mime.dvi: $(emacs_mime_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
+-emacs-mime.pdf: $(emacs_mime_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
+-emacs-mime.html: $(emacs_mime_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
+-
+-epa_deps = ${srcdir}/epa.texi ${gfdl}
+-epa : $(buildinfodir)/epa$(INFO_EXT)
+-$(buildinfodir)/epa$(INFO_EXT): $(epa_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/epa.texi
+-epa.dvi: $(epa_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
+-epa.pdf: $(epa_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
+-epa.html: $(epa_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/epa.texi
+-
+-erc_deps = ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl}
+-erc : $(buildinfodir)/erc$(INFO_EXT)
+-$(buildinfodir)/erc$(INFO_EXT): $(erc_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi
+-erc.dvi: $(erc_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
+-erc.pdf: $(erc_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
+-erc.html: $(erc_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/erc.texi
+-
+-ert_deps = ${srcdir}/ert.texi ${gfdl}
+-ert : $(buildinfodir)/ert$(INFO_EXT)
+-$(buildinfodir)/ert$(INFO_EXT): $(ert_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ert.texi
+-ert.dvi: $(ert_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
+-ert.pdf: $(ert_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
+-ert.html: $(ert_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ert.texi
+-
+-eshell_deps = ${srcdir}/eshell.texi ${gfdl}
+-eshell : $(buildinfodir)/eshell$(INFO_EXT)
+-$(buildinfodir)/eshell$(INFO_EXT): $(eshell_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eshell.texi
+-eshell.dvi: $(eshell_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
+-eshell.pdf: $(eshell_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
+-eshell.html: $(eshell_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eshell.texi
+-
+-eudc_deps = ${srcdir}/eudc.texi ${gfdl}
+-eudc : $(buildinfodir)/eudc$(INFO_EXT)
+-$(buildinfodir)/eudc$(INFO_EXT): $(eudc_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eudc.texi
+-eudc.dvi: $(eudc_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
+-eudc.pdf: $(eudc_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
+-eudc.html: $(eudc_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eudc.texi
+-
+-eww_deps = ${srcdir}/eww.texi ${gfdl}
+-eww : $(buildinfodir)/eww$(INFO_EXT)
+-$(buildinfodir)/eww$(INFO_EXT): $(eww_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eww.texi
+-eww.dvi: $(eww_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eww.texi
+-eww.pdf: $(eww_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eww.texi
+-eww.html: $(eww_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eww.texi
+-
+-flymake_deps = ${srcdir}/flymake.texi ${gfdl}
+-flymake : $(buildinfodir)/flymake$(INFO_EXT)
+-$(buildinfodir)/flymake$(INFO_EXT): $(flymake_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/flymake.texi
+-flymake.dvi: $(flymake_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
+-flymake.pdf: $(flymake_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
+-flymake.html: $(flymake_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/flymake.texi
+-
+-forms_deps = ${srcdir}/forms.texi ${gfdl}
+-forms : $(buildinfodir)/forms$(INFO_EXT)
+-$(buildinfodir)/forms$(INFO_EXT): $(forms_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/forms.texi
+-forms.dvi: $(forms_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
+-forms.pdf: $(forms_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
+-forms.html: $(forms_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/forms.texi
+-
+-## gnus/message/emacs-mime/sieve/pgg are part of Gnus.
+-gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
+-gnus : $(buildinfodir)/gnus$(INFO_EXT)
+-$(buildinfodir)/gnus$(INFO_EXT): $(gnus_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi
+-gnus.dvi: $(gnus_deps)
+- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+- $(ENVADD) $(TEXI2DVI) gnustmp.texi
+- cp gnustmp.dvi $@
+- rm gnustmp.*
+-gnus.pdf: $(gnus_deps)
+- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+- $(ENVADD) $(TEXI2PDF) gnustmp.texi
+- cp gnustmp.pdf $@
+- rm gnustmp.*
+-gnus.html: $(gnus_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/gnus.texi
+-
+-htmlfontify_deps = ${srcdir}/htmlfontify.texi ${gfdl}
+-htmlfontify : $(buildinfodir)/htmlfontify$(INFO_EXT)
+-$(buildinfodir)/htmlfontify$(INFO_EXT): $(htmlfontify_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/htmlfontify.texi
+-htmlfontify.dvi: $(htmlfontify_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/htmlfontify.texi
+-htmlfontify.pdf: $(htmlfontify_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/htmlfontify.texi
+-htmlfontify.html: $(htmlfontify_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/htmlfontify.texi
+-
+-idlwave_deps = ${srcdir}/idlwave.texi ${gfdl}
+-idlwave : $(buildinfodir)/idlwave$(INFO_EXT)
+-# NB this one needs --no-split even without a .info extension.
+-$(buildinfodir)/idlwave$(INFO_EXT): $(idlwave_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/idlwave.texi
+-idlwave.dvi: $(idlwave_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
+-idlwave.pdf: $(idlwave_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
+-idlwave.html: $(idlwave_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/idlwave.texi
+-
+-ido_deps = ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl}
+-ido : $(buildinfodir)/ido$(INFO_EXT)
+-$(buildinfodir)/ido$(INFO_EXT): $(ido_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ido.texi
+-ido.dvi: $(ido_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ido.texi
+-ido.pdf: $(ido_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ido.texi
+-ido.html: $(ido_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ido.texi
+-
+-info_deps = ${srcdir}/info.texi ${gfdl}
+-# Avoid name clash with overall "info" target.
+-info.info : $(buildinfodir)/info$(INFO_EXT)
+-# NB this one needs --no-split even without a .info extension.
+-$(buildinfodir)/info$(INFO_EXT): $(info_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/info.texi
+-info.dvi: $(info_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+-info.pdf: $(info_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
+-info.html: $(info_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/info.texi
+-
+-mairix_el_deps = ${srcdir}/mairix-el.texi ${gfdl}
+-mairix-el : $(buildinfodir)/mairix-el$(INFO_EXT)
+-$(buildinfodir)/mairix-el$(INFO_EXT): $(mairix_el_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mairix-el.texi
+-mairix-el.dvi: $(mairix_el_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
+-mairix-el.pdf: $(mairix_el_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
+-mairix-el.html: $(mairix_el_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/mairix-el.texi
+-
+-message_deps = ${srcdir}/message.texi ${gfdl}
+-message : $(buildinfodir)/message$(INFO_EXT)
+-$(buildinfodir)/message$(INFO_EXT): $(message_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/message.texi
+-message.dvi: $(message_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
+-message.pdf: $(message_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
+-message.html: $(message_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/message.texi
+-
+-mh_e_deps = ${srcdir}/mh-e.texi ${gfdl}
+-mh-e : $(buildinfodir)/mh-e$(INFO_EXT)
+-$(buildinfodir)/mh-e$(INFO_EXT): $(mh_e_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mh-e.texi
+-mh-e.dvi: $(mh_e_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
+-mh-e.pdf: $(mh_e_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
+-mh-e.html: $(mh_e_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/mh-e.texi
+-
+-newsticker_deps = ${srcdir}/newsticker.texi ${gfdl}
+-newsticker : $(buildinfodir)/newsticker$(INFO_EXT)
+-$(buildinfodir)/newsticker$(INFO_EXT): $(newsticker_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/newsticker.texi
+-newsticker.dvi: $(newsticker_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+-newsticker.pdf: $(newsticker_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
+-newsticker.html: $(newsticker_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/newsticker.texi
+-
+-nxml_mode_deps = ${srcdir}/nxml-mode.texi ${gfdl}
+-nxml-mode : $(buildinfodir)/nxml-mode$(INFO_EXT)
+-$(buildinfodir)/nxml-mode$(INFO_EXT): $(nxml_mode_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/nxml-mode.texi
+-nxml-mode.dvi: $(nxml_mode_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
+-nxml-mode.pdf: $(nxml_mode_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
+-nxml-mode.html: $(nxml_mode_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/nxml-mode.texi
+-
+-octave_mode_deps = ${srcdir}/octave-mode.texi ${gfdl}
+-octave-mode : $(buildinfodir)/octave-mode$(INFO_EXT)
+-$(buildinfodir)/octave-mode$(INFO_EXT): $(octave_mode_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/octave-mode.texi
+-octave-mode.dvi: $(octave_mode_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/octave-mode.texi
+-octave-mode.pdf: $(octave_mode_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/octave-mode.texi
+-octave-mode.html: $(octave_mode_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/octave-mode.texi
+-
+-org_deps = ${srcdir}/org.texi ${gfdl}
+-org : $(buildinfodir)/org$(INFO_EXT)
+-$(buildinfodir)/org$(INFO_EXT): $(org_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/org.texi
+-org.dvi: $(org_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
+-org.pdf: $(org_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
+-org.html: $(org_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/org.texi
+-
+-pcl_cvs_deps = ${srcdir}/pcl-cvs.texi ${gfdl}
+-pcl-cvs : $(buildinfodir)/pcl-cvs$(INFO_EXT)
+-$(buildinfodir)/pcl-cvs$(INFO_EXT): $(pcl_cvs_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
+-pcl-cvs.dvi: $(pcl_cvs_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
+-pcl-cvs.pdf: $(pcl_cvs_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
+-pcl-cvs.html: $(pcl_cvs_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
+-
+-pgg_deps = ${srcdir}/pgg.texi ${gfdl}
+-pgg : $(buildinfodir)/pgg$(INFO_EXT)
+-$(buildinfodir)/pgg$(INFO_EXT): $(pgg_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pgg.texi
+-pgg.dvi: $(pgg_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
+-pgg.pdf: $(pgg_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
+-pgg.html: $(pgg_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/pgg.texi
+-
+-rcirc_deps = ${srcdir}/rcirc.texi ${gfdl}
+-rcirc : $(buildinfodir)/rcirc$(INFO_EXT)
+-$(buildinfodir)/rcirc$(INFO_EXT): $(rcirc_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/rcirc.texi
+-rcirc.dvi: $(rcirc_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
+-rcirc.pdf: $(rcirc_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
+-rcirc.html: $(rcirc_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/rcirc.texi
+-
+-reftex_deps = ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl}
+-reftex : $(buildinfodir)/reftex$(INFO_EXT)
+-$(buildinfodir)/reftex$(INFO_EXT): $(reftex_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi
+-reftex.dvi: $(reftex_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
+-reftex.pdf: $(reftex_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
+-reftex.html: $(reftex_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/reftex.texi
+-
+-remember_deps = ${srcdir}/remember.texi ${gfdl}
+-remember : $(buildinfodir)/remember$(INFO_EXT)
+-$(buildinfodir)/remember$(INFO_EXT): $(remember_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/remember.texi
+-remember.dvi: $(remember_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
+-remember.pdf: $(remember_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
+-remember.html: $(remember_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/remember.texi
+-
+-sasl_deps = ${srcdir}/sasl.texi ${gfdl}
+-sasl : $(buildinfodir)/sasl$(INFO_EXT)
+-$(buildinfodir)/sasl$(INFO_EXT): $(sasl_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sasl.texi
+-sasl.dvi: $(sasl_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
+-sasl.pdf: $(sasl_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
+-sasl.html: $(sasl_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sasl.texi
+-
+-sc_deps = ${srcdir}/sc.texi ${gfdl}
+-sc : $(buildinfodir)/sc$(INFO_EXT)
+-$(buildinfodir)/sc$(INFO_EXT): $(sc_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sc.texi
+-sc.dvi: $(sc_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
+-sc.pdf: $(sc_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
+-sc.html: $(sc_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sc.texi
+-
+-semantic_deps = ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl}
+-semantic : $(buildinfodir)/semantic$(INFO_EXT)
+-$(buildinfodir)/semantic$(INFO_EXT): $(semantic_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/semantic.texi
+-semantic.dvi: $(semantic_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
+-semantic.pdf: $(semantic_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
+-semantic.html: $(semantic_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/semantic.texi
+-
+-ses_deps = ${srcdir}/ses.texi ${gfdl}
+-ses : $(buildinfodir)/ses$(INFO_EXT)
+-$(buildinfodir)/ses$(INFO_EXT): $(ses_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ses.texi
+-ses.dvi: $(ses_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
+-ses.pdf: $(ses_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
+-ses.html: $(ses_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ses.texi
+-
+-sieve_deps = ${srcdir}/sieve.texi ${gfdl}
+-sieve : $(buildinfodir)/sieve$(INFO_EXT)
+-$(buildinfodir)/sieve$(INFO_EXT): $(sieve_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sieve.texi
+-sieve.dvi: $(sieve_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
+-sieve.pdf: $(sieve_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
+-sieve.html: $(sieve_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sieve.texi
+-
+-smtpmail_deps = ${srcdir}/smtpmail.texi ${gfdl}
+-smtpmail : $(buildinfodir)/smtpmail$(INFO_EXT)
+-$(buildinfodir)/smtpmail$(INFO_EXT): $(smtpmail_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/smtpmail.texi
+-smtpmail.dvi: $(smtpmail_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
+-smtpmail.pdf: $(smtpmail_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
+-smtpmail.html: $(smtpmail_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/smtpmail.texi
+-
+-speedbar_deps = ${srcdir}/speedbar.texi ${gfdl}
+-speedbar : $(buildinfodir)/speedbar$(INFO_EXT)
+-$(buildinfodir)/speedbar$(INFO_EXT): $(speedbar_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/speedbar.texi
+-speedbar.dvi: $(speedbar_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
+-speedbar.pdf: $(speedbar_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
+-speedbar.html: $(speedbar_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/speedbar.texi
+-
+-srecode_deps = ${srcdir}/srecode.texi ${gfdl}
+-srecode : $(buildinfodir)/srecode$(INFO_EXT)
+-$(buildinfodir)/srecode$(INFO_EXT): $(srecode_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/srecode.texi
+-srecode.dvi: $(srecode_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/srecode.texi
+-srecode.pdf: $(srecode_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/srecode.texi
+-srecode.html: $(srecode_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/srecode.texi
+-
+-todo_mode_deps = ${srcdir}/todo-mode.texi ${gfdl}
+-todo-mode : $(buildinfodir)/todo-mode$(INFO_EXT)
+-$(buildinfodir)/todo-mode$(INFO_EXT): $(todo_mode_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/todo-mode.texi
+-todo-mode.dvi: $(todo_mode_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/todo-mode.texi
+-todo-mode.pdf: $(todo_mode_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/todo-mode.texi
+-todo-mode.html: $(todo_mode_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/todo-mode.texi
+-
+-tramp_deps = ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl}
+-tramp : $(buildinfodir)/tramp$(INFO_EXT)
+-$(buildinfodir)/tramp$(INFO_EXT): $(tramp_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
+-tramp.dvi: $(tramp_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
+-tramp.pdf: $(tramp_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
+-tramp.html: $(tramp_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
+-
+-url_deps = ${srcdir}/url.texi ${gfdl}
+-url : $(buildinfodir)/url$(INFO_EXT)
+-$(buildinfodir)/url$(INFO_EXT): $(url_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/url.texi
+-url.dvi: $(url_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
+-url.pdf: $(url_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
+-url.html: $(url_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/url.texi
+-
+-vip_deps = ${srcdir}/vip.texi ${gfdl}
+-vip : $(buildinfodir)/vip$(INFO_EXT)
+-$(buildinfodir)/vip$(INFO_EXT): $(vip_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vip.texi
+-vip.dvi: $(vip_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
+-vip.pdf: $(vip_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
+-vip.html: $(vip_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/vip.texi
+-
+-viper_deps = ${srcdir}/viper.texi ${gfdl}
+-viper : $(buildinfodir)/viper$(INFO_EXT)
+-$(buildinfodir)/viper$(INFO_EXT): $(viper_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/viper.texi
+-viper.dvi: $(viper_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
+-viper.pdf: $(viper_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
+-viper.html: $(viper_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/viper.texi
+-
+-widget_deps = ${srcdir}/wisent.texi ${gfdl}
+-widget : $(buildinfodir)/widget$(INFO_EXT)
+-$(buildinfodir)/widget$(INFO_EXT): $(widget_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/widget.texi
+-widget.dvi: $(widget_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
+-widget.pdf: $(widget_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
+-widget.html: $(widget_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/widget.texi
+-
+-wisent_deps = ${srcdir}/wisent.texi ${gfdl}
+-wisent : $(buildinfodir)/wisent$(INFO_EXT)
+-$(buildinfodir)/wisent$(INFO_EXT): $(wisent_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/wisent.texi
+-wisent.dvi: $(wisent_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/wisent.texi
+-wisent.pdf: $(wisent_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/wisent.texi
+-wisent.html: $(wisent_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/wisent.texi
+-
+-woman_deps = ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl}
+-woman : $(buildinfodir)/woman$(INFO_EXT)
+-$(buildinfodir)/woman$(INFO_EXT): $(woman_deps)
+- $(mkinfodir)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi
+-woman.dvi: $(woman_deps)
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
+-woman.pdf: $(woman_deps)
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
+-woman.html: $(woman_deps)
+- $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/woman.texi
+-
+ .PHONY: mostlyclean clean distclean maintainer-clean
+
+ mostlyclean:
+diff --git a/lisp/help.el b/lisp/help.el
- index fa2a4f2..03f7e0b 100644
++index 80eb308..d009747 100644
+--- a/lisp/help.el
++++ b/lisp/help.el
- @@ -286,6 +286,14 @@ If that doesn't give a function, return nil."
++@@ -287,6 +287,14 @@ If that doesn't give a function, return nil."
+ (goto-address-mode 1)
+ (goto-char (point-min)))
+
++(defun debian-expand-file-name-dfsg (filename)
++ "Apply expand-file-name to FILENAME.
++If expand-file-name does not find a file, append `.dfsg' and try again."
++ (let ((file (expand-file-name filename data-directory)))
++ (if (file-exists-p file)
++ file
++ (expand-file-name (concat file ".dfsg") data-directory))))
++
+ (defun describe-distribution ()
+ "Display info on how to obtain the latest version of GNU Emacs."
+ (interactive)
- @@ -299,7 +307,7 @@ If that doesn't give a function, return nil."
++@@ -300,7 +308,7 @@ If that doesn't give a function, return nil."
+ (defun describe-gnu-project ()
+ "Display info on the GNU project."
+ (interactive)
+- (view-help-file "THE-GNU-PROJECT"))
++ (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT")))
+
+ (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
+
projects / emacs.git / commitdiff